auto merge of #509 : alexcrichton/cargo/features, r=wycats
authorbors <bors@rust-lang.org>
Tue, 23 Sep 2014 01:53:52 +0000 (01:53 +0000)
committerbors <bors@rust-lang.org>
Tue, 23 Sep 2014 01:53:52 +0000 (01:53 +0000)
commitaf066ef1e27f82595b8d60ec514dffdc7921338a
tree4dad6317335029f2db2a4f1728f01ddf0a108a40
parenta54cb70e74a0882e408529907f1da6c540f74815
parent2b46d039c01b56e895adf012ed34103e06e18835
auto merge of #509 : alexcrichton/cargo/features, r=wycats

This feature was outlined in #385 [1], and documentation has been included as
part of this commit.

[1]: https://github.com/rust-lang/cargo/issues/385#issuecomment-53917539

Closes #385